Remove blocking calls and fixes