Last minior fixes