Made changes to build in IntteliJ and with ant