Catch up with rs-mysql changes