Random fixes (thanks K-T!)