Some improvements to be more assignment conform