Fixed non-nullable value
More fixes.