Fixing issues part 1