Fixed a few bugs with Josh