Some changes to make it easier for other developers to contribute.