Mobile API site calls defined type correctly
Small fixes and tidy