Fix Compile

Last 2 commits.