Small fixes and simplifications.