Minor bug fixes
Merge branch 'master' of github.com:jamiebclark/Uploadable