Bug Fixes and Proxy basics