Small fixes and improvements to the blockchain import process