Cleanups and extra checks

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
9 files changed