13.02 issue fixes