partial export fixes