Fixes for Chris