Fix exports and minor changes