Fix the issues per Nick's testing