Fix omissions and errors