Fix: async issues