Fixes SA00072, SA00073, SA10150, SA10151, Issue2076

Improves SA10153
Signed-off-by: Anton Khirnov <anton@khirnov.net>