Some general cleanups