minor tweaks

after syncing with ASDS