another patch of scru fixes