Fix some warning messages.
More tidying
Fix apparent typo