fix unix build.
adding missing things
Merge remote-tracking branch 'mine/temp_maid404' into temp_maid404
explicitly call null