Added some things that were forgotten when merging with master.
Re-added feed fix from Troy's PR