Remove StripPrefix
Additional fixes