Tidy up.
Noticed more issues.