Improvements to block handling