fix some compilation issues