Fixed a bug or two