Fix typos/small bugs