Current bugs fixed