Minor code changes to get rif of warnings from gcc