Some clean up and removal of warnings.