some more fixes, blocking stil are indeed blocking