Updates for compiler warnings