Several more changes to make CRUDFU work better

Mostly this is recovered after VPS failure, but there are some
minor points here and there that could still improve (again).