API issue fixes