-- Fix resolving null declarations