small changes for stability asuka1

Should reduce the chance of bugs, if any.