Fix some trubls