API Fixes mostly