Fixed a few small bugs (v2.1b)