Better fake channel construction.
Merge branch 'develop' into develop-frontend
Fix a few more uses of old fake channels. (@Hodgestar)