Configure minor fixes