Fix require order and typos