Some fixes - mainly typos