Improvements

Fixes from the issues list.