Fixes up

A couple more fixes found on site.