I committed some changes that should alleviate both problems.