Minor modifications to assist with Maven plugin