Minor Code Changes.