Fix exports & dependencies