Fix exported functions, fix shadowed binding