Added portability stuff.