Added multiple fixes