Fixing issues

http://screencast.com/t/1iMzGN1yb