Restored proper LUA calls with builtin="lua@lua" + minor fixes