Quick fixes for 1.7.8