Minor fixes and doco