Fixes for backward compatibility

With Models trained before attr_mask was introduced