Lazar's bugs fixed