Some fixes for PGF style equipment file