Fixes and notes