patching more tapku inconsistencies…