Improving stability and fixing some cross mod issues.