Fixes to Embarassing Problems