Small fixes for the old branch

I'm cleaning up my forks right now and these small patches is all I have left. If you could merge them to the old EDN, I could kill my fork and point my colleagues to yours. Thanks!