Clean up fixes from last commit