Bulk bugfixes