Fix a problems