Fixed Nabi Issues N_SE-45632