changes to make paths cross-platform