Various fixes for mer-hybris