Bug fixes for castlewars