Bugfixes: Hardcoded HWK removed