Bug Fixes, again