More fixes related to recent EditBuffer changes. These issues were found by Visual Studio.