Fixing some Maven problems