add more NonNull annotations where necessary