Fix minor compile fails (on g++).