Fixed Maven build issues