Some cmake fixes.

--BRJ