Added infernus fixes