More fixes to allow use in docker containers