Bulk bug fixes