Fixed debug info and classes