Fixed bugs related to tickets opened on GitHub