All the usual stuff
fixes