Merge nick's changes to fix path bugs