Added top-level solution file
Fixed some build issues, caused by merging the journalling branch