Update: Bug fixes