more Linux portability changes (geez, what a pain)