[PATCH v2 0/8] Small cleanup and a two fixes