Fixes to accessparser