Trying to fix bugs in production