More static code and Maven fixes