API Fixes for Composer Compatibility