[FIX] More bugs fixed.