Functional Bug Fixes