More Chris Fixes