Fixing some stuff to use with intelliJ without warnings