[UNSTABLE] Minor changes for debugging purposes