+1 to take care of these in a future patch