Stubbed Potential Bug Fixes