Explicitly require some vars, typos