Fixes for work with new behaviour