Powerup tweaks, and fixed som convertions warinings
Merge 1
Merge 2