bug fixes for new architecture