smalle fixes with linus