Solve some setup issues