Fixing errors introduced during debugging checkpoint