Fixes nulls/@Nullable (just for router for now)