Smoothen some more weapon role choices