Fixed several (obvious) places that don't work with vpath build.
Attach a file by drag & drop or click to upload