22 Apr fixes