More or to || fixes.