Further modifications related to JavaFX 8