API Friendly fixes