varous fixes