Bugs fixed (from branch Dropbox)