probably fix #1. Please report back if it works.