Fixes to work with last change