Fix stupidities