Fix stupid and small bugs