Tweaks to HQL