Small clean up + Fix import NULL.