Battle for Rakir: More bug fixes.

Seems like there are always more bugs.