Fixed some small bugs.
Fixes with Guardian Angel