Fixes for usability.