Fixed note bugs