Gah, more path fixes