Fixes after talking with Jessica