Fixed different issues