Some usless fixes