Fix lot of api breaks