Fix up issues and clean some attributes there