Even more responsive fixes