Fixes based on alpha user comments.