Fix for compiler warnings