Fixes: suggestions by @matiu