minor adjustments to avoid compiler warnings