Fixes for review comments by auroraeosrose