API quick fixes