Wrapping up the last few fixes