Changes to crdroid