Paths Fixes