HSIC tweaks