multiple fixes for sprint 13