Fixing some usability bugs!