fixes for blocks and inline editing