Fixed tiny issues