Cleanups and two new checks