More bug cleanup.