misc small changes in paths etc