Fixed a few small problems