Fix issues that are cropping up