Fixed more Saleh/Dale stuff