Few more responsive fixes