Fixing issues Doug told me about