Fixing NOTES and WARNINGs