Fix remaining API issues