More supplication fixes