Fix some exports