Build Fix for our Device