[PATCH v3 00/15] Various small cleanups and improvements