Fixes as a result of real-world testing