More fixes for architect version