Fixes from OS-X community feedback.