Fixing various CLI not responding issues.