Addressed Warnings