Minor tweaks to be used as stable release for Anyaproject