Additional improvements in code portability.