Buildfix (a few platforms)