More simplifications and fixes