#8 preparations and fixes