Fixed paths issues