more initial fixes