Closes #433 and closes #432