Minor compiler warning fixes