Some minor responsiveness improvements