Updated various fixes