Fixes from thread