Did some minor fixes