Added daxda's fixes