Some fixes, trace info.