fixes for javafx client