More deferred bugfixes and tests