Fixed tiny stuff