Attempt to fix a few things which are screwed in docker images