Minor clean-up for portabililty