fixes for i686