Warnings, performance improvement