tweaks for aw bug fixes