Fixed various late-night oops