Few more quick fixes that should have gone into that last push.