Fixed Nabi issues N_SE-43611, N_SE-43441