Fixes from habib