Fix some tiny issues