Few more followup compilation error fixes