Fixed issues (part 2)