Debugging in process. Some fixes