#MAL-31. Post-review fixes