Fix some issues discovered with latest OS