More default int fixes in libs