Small fixes & cleanups