Newest fixes