Fixes from self revision