Updating assertions and TODOs