Misc changes in IDEA project