Further work on TileEntity compatibility.