Fix some string NULL handling