Fixes, also task -> observable