Minor fixes and notes to self