Fix #188 and more things