Fix version cookie handling
Fix internal_bug pseudo-field import