Fixed path inconsistencies