Prepare for debugging task
Fix bugs