Fix a bugs master