Add debug info and fix signature.