[misc] Fixing minor bugs.