Fixes from last time