Final assignment tweaks, remove unfinished warning