Fix the Note issues