Fixed paths handling.