Fixes for Tekkit and 1.2.5 compatibility