Changes to work with what I pushed to the 3.8 kernel