Cleaning up some unchecked in changes.