Some more fixes mainly for fire control