untested changes for libc, will test at home :)