more skeleton export fixes