Fixing maven compatibility issues