Minor changes affecting compiling and continuous integration