Makes some minor fixes