Fixed up various APIs