Updating keys already marked as fixme