few misc googie fixes