Minor tweeks to fix install