Native functions, minor changes