Some of bugs solved