More fixes related to the Tap 5.3-to-5.4 upgrade