[FIX] Fixed a few issue due to merge errors.