Fix some stuff up for Intelij