Fix minor issues noticed when moving to new server