somebug fixes