minor fixes related to path construction