Git and Maven fixes