Extra Bug Fixes