-- Fix some bugs