Minor improvments

Authored by sirgienko on Feb 23 2019, 7:16 PM.