Fixed a bit more assignments code