Fix observable factories