Summariser fixes and such