Few fixes for sensio to shut up