Applied Energistics - Fixes/Backport