Removed blocking
Fixed warnings