Small modifications to reduce number of compiler warnings