Fix some useless things