Fixes and Simplifications