Fixed problems caused by missing exports and imports due to recent changes.