Add fixes to get production running