Minor maven fixes