Merging Micah's and my fixes