Minor changes in IC2 compatibility to solve a draining issue