[PATCH 0/3] Assorted fixes