Fix some little bugs

Auditors: eater