Fix a couple bugs from first round of debugging

 - Still much debugging to go...