some fixes for bugs found by RxD