Double bugs in Ori and the Will of the Wisps

Hi!

I have already sent this to PR since I covered the game for a website I have, but these glitches/bugs have not yet been adressed properly it seems.

1. Power Cells glitch

Halfway into the game I (for some reason) got the achievement for collecting all of the power cells, BUT I already knew that was wrong since I only had (and still have) 8/20. That made me finishing the game two days before launch with only 8 power cells
and still to this day, no update has fixed that problem unfortunately.

Anyone have the same issue?

2. Last fetch quest where is Tokk?

I need to give the ancient map to Tokk because he got the ancient stone tablet or whatever it was, and each time i look on the map I see Tokk is supposed to be at the place by the bridge, but he isn't. And I promise you, I have search the whole damn world
for him, but can't find him.

So these two. Not so fun having them still be left when everything else is finished...

Anyone?

:)