Some minor bug fix attempts