Fix bugs

Next commit: warning long line