April fixes