Assorted fixes for running in docker