Small maven fixes