Fenix API Minor Fixes

Fenix API Minor Fixes