[FIX] Changes from comments.