SHDR : various fixes