Fixes for build process, building root container now works