Apply some IDEA fixes