Fix some issues related to maven deps and assemblies.