Eliminated a few warnings and fixed a crash when trying to start EditLinksActivity
merged