Fixes two prod bugs that we're seeing...