Manual Bug Fixes