Nagath's Bug Fixes