Fixes for Chris.