Small Bugs fixed