Fixes for issues discovered in transition to new MacBook Pro