Fixed some warnings in compiling.

Re-added cedar.