Fixed some API issues that incorrectly referenced base code