A few more quick fixes.