Fixes for parser