A few loose ends to clean up here...