More assignment fixing