Some other simplifications