Some minior fixes.