belated, hopefully final fixes