Fixes for last bits of assignment