Fixed all NPEs