Bug Fix and Others