Tiny patches by Alexey Loginov #2