Some last minor changes