Not so minor fixes