Fix #1; Possibly correct #2