More Fixes to Things Jordan and Chris Broke