More fixes for symbol storage