Fixes for rare parsing problems