Fix some trouble