More fixes for Potcar parsing.