Warnings addressed