#617
Quick fixes