Partial fix for compiler warnings