Fixes for null
Fixes link