Fixes from Pierre