Making a few updates to clear out compiler warnings