Some fixes, paste wasn't working right