Fixes for processing Architecture page