Few responsive fixes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>