Minior fixes