Fix #72, #70, and #63