A few updates I needed to make the the code work on a new machine