more compiler warning fixes