Fix path problems in Shape