Add missing dependency, clean up VS soln file, fix bool expression.