More misc polish