merging fixes that should have been in devel to begin with