[PATCH 0/5] Miscellaneous trivial fixes