Fixes. #199 and others, merges and such