Fix broken paths and some other errors