Update: Bug Fixes