Fixes on API side