Yet other neccessary changes to mvn clean install gapt with no errors