Some tweaks - published 0.7.11