Device: Compile fixes