Fix Maven build errors after previous commits