Mainly Cerber updates