WIP: make docker-run build work with non-root user
WIP: fixes and make docker-run builds work
Cosmetic tweaks