Bugs at master fixed