More singleton fixes
Fix Slice API decorator