Fixed Nabi issues N_SE-49218, N_SE-49706