Fixes and Changes