Fixes from Linux