Update: Fix bug issues