Fixes and Battle