Fixes and Nullable addition