Bug fixes N stuff.