Fixes based on most recent feedback