Some man fixes