Important fixes including bug in Production