Fixed minor Bugs