Fixed various api