Compile fixes for last commit (see issue #133).