Various fixes and what not.