Some fixes (skype discussion)