Some fixes of this shit. Java sucks