Fix Minor Ugliness