add unmapself, fix compilation warnings