Fix: Undefined variable & undefined constant
Merge branch 'bugfree' of https://github.com/DZCP-Community/dzcp into bugfree