Commercial comp bugs

This sorts out various small but irritating bugs with the commercial components.

See https://docs.google.com/a/guardian.co.uk/spreadsheets/d/1Up782yIhUvd7eaoYgbBJXcbbyI0fbhTTKZt_k2cPhOY/edit#gid=0 for more info.