Fixes for OSX (with new icon support)