Warnings cleanup. @densh does it work for you?