DeBogger check some smal fixes