Small changes to element assignment