Fixes for Paths