mistaqur's bugfixes for IC2 1.109