fixes for vanilla install