Fix for Lint Warnings