Fixed some small bugs.
Fixes with Guardian Angel
Should have fixed bug with Eagle Eye map