Updated assets and some CMake files

The cmake changes are need on Windows where explicit paths are set.