Some addons, fixes etc...