Fix various concerns re: #128