Fixes items 3 & 5

http://issues.craftercms.org/browse/CRAFTERCMS-465