A few simplifications and hopefully fixes