Fixing commotiond build errors