Fixes and addons