Fixes and Fixes, again...