some fixes for 1098