Fixes for regressions