Fixed java imports