More IC2 and assorted fixes