Some tired, sleepy fixes