Bug fixes - see mcblockit commit for details