Hopefully fix path problems