Fixed build for devices