Bug Fixed

Minor bug fixes