Fixed tiny bugs