Started Bug Fixes