Fix tiny bugs.