Fixes for recent PR