Some fixes and addons