Fixes for proper Maven compilation.