Minor fixes and additions