Fix solution paths and some other small things