minior fixes