Assorted #25/#45 - 507-291

[]