Maven build fixes