Minor changes for testing custom JSR352 module