Further patch work