Remediated fixlets

Please reference the following post: