NXBOOK-745 and NXBOOK-736 minor tweaks