Fixes to get_block