Fixes from linux prod