Hopefully fix all API changes