Refactorings, Parser fixes