fixes for assignments