Fixing bugs found in prod