Fixed a few bugs that came with the fifth release