Tidy up issues

A few fixes for minor issues.