Even more API Fixes