old fixes from last night