Fixed found issues