Patch - Bug Fixes