Re-enabled some debugging options