Improved handeling on nullable types (propper commit this time)

VS seems to be out of sync an doing strange things hence the odd commits