Fixed a couple of compilations issues that were introduced in the last commit.  Note: this commit hasn't been fully tested yet.