Small changes to get it inline with my setup.