Parsing cleanups and fixed a default bus for transformers