GPG and some other fixing