Additioal fixes