Some more fixes for api file.