Fixes #418 and various inline edit issues