Fix tiny issues