Fixed general bugs