Fixes for Chris;