Fix exported functions