Fixes

Various fixes to the build in response to changes over the last few days. This removes warnings generated by CMake 3.1 and errors when building the discrete bridge with VTK's OpenGL2 backend, among other things.