Fixed all found issues