Fixes based on yesterday's commit