More small utility improvements