some fixes for sprint 38