[BUG-FIX] Fixing more bugs