Collection of small cleanups