bug fixes for architect