[PATCH 0/3] Some random fixes