some fixes which do not seem to have done the job yet