Issues resolved

Issues resolved