minor api compatibility related fixes