Minor stability fixes. CAE MySQL active on this commit