Small bugfixes, push to get travis to rebuild