Attempted Bug Fixes