Fixes from comments