Some minor imporovements.