Some fixes and what not.