couple of fixes for scala stuff