Project Transformer Fixes