Oops, fixing some compilation warnings.