Re-enable some debugging hacks for Cosmin