Notes and fix