Some fixes for faster block marking