Fixes null performances and armaments