fixed few hq related errors