Cleanup, add missing vars