Fix contacty things more