blocking fixes, more to do