I've committed both of these fixes for all Apple II models. Thanks again!