Fixing minor api issues