Various fixes to make container run nicely as the user who started it