Fix some low-hanging warnings