Java 1.7 and OSX with Retina does work

+ Removed a part of instrument special-casing
+ Fix for OSX with Retina display