Fixed up some interface