Bugfix for #287
Solution file tweaks