Improve JDK7 / JavaFX interoperability