Changes for resolving all issues raised by CreatorParserTest.php