Fix assignment errors

Fix the errors within the assignment code