add few fixes from scru