(A few minor pending patches I had around)