minor bug fixes on new arch