Resolved several undefined