Clean up typos and warnings