Fix build and do some more work towards DRX support