Fix build problems associated with maven merge