bug fixes for new arch