Add back clearlooks-phenix 5 and fix slotting for 6