NBIA-644 and NBIA-683 Fix