Fix some other issues