Some maven fixes