#macplus - responsibility fixes