Strict Errors Fixed