some small fixes for gcc 6.1
also, a minor change to some private config files (machine name change).