Fix dependencies and maven modules issues