Fixes for Parser