Fixed some scala wrapper import issues