Fix two simple almost-bugs