Tidy up a few things for Bolt 2 compliance