Fixed timing errors with the /api