Very last minute notes tweaks