some fixes

collection of local patches
This needs to actually work with INCLUDE_INSTALL_DIR. IIRC there is some CMake functions for converting to relative paths though.