Some changes to make the contrib stuff more relevant