Revert "Little fixes"

This reverts commit 5cf607872b4287f87ff9fe5ab8f73f7da61e3bfa.
Fix server crash. channelID was not defined