fix clang compiler warnings

Signed-off-by: Gregory Petrosyan <gregory.petrosyan@gmail.com>
Merge branch 'master' into show-all-tracks