Small fixes

Capitalisation and context fixes