Fix some troubles