Various small changes & cleanups