Updates from cerberus

Tidy up