Bug Fixes redux