fixing prod bugs