* Fixed things that I had broken with the last patch :-(