Fixes and project's pom.xml restiling