Fixes and Addons