Small bug fixes for editing entries