Fixes for new client behaviours