Fix some lingering mistakes