Small changes to eliminate compiler warnings