Add missing byte masks in collector