Additional minor changes to Assignment