fixes to make some compilers happy
revert the changes of 4634f273092177bd4b00e00d127b9d1c39caa391