Bug Fixes (POSTS) + TOU + UsagePolicy